Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 16:11:49 +0000 (09:11 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 16:11:49 +0000 (09:11 -0700)
commit485a6cd64b51e7ceca532f53aa655c9889da392d
treee13a88dac941307afd0b8ee3cd51a3a52b494103
parent842c77eb54c1f5a50e2f944c5735486aafcf97d6
parent6deaa570f341420f08b68790544be090888813ca
Merge from mainline.
src/ChangeLog